From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 26 Jun 2014 15:50:33 +0000 (+0000)
Subject: Merge "Avoid key conflict errors in User::addToDatabase"
X-Git-Tag: 1.31.0-rc.0~15230
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=698cfad8b9380f070e53dd24475cac9dbb3b401b;p=lhc%2Fweb%2Fwiklou.git

Merge "Avoid key conflict errors in User::addToDatabase"
---

698cfad8b9380f070e53dd24475cac9dbb3b401b